-
-
Notifications
You must be signed in to change notification settings - Fork 538
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New sand ruin - the E-11 Manufacturing Plant. #3304
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Map Change
Tile placing is hard. Thank you for your service.
Code change
Watch something violently break.
labels
Aug 22, 2024
FalloutFalcon
approved these changes
Sep 20, 2024
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Oct 28, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Oct 28, 2024
Sighs so bigly. |
shiptest-server
pushed a commit
that referenced
this pull request
Oct 28, 2024
zimon9
pushed a commit
to zimon9/Shiptest-PR-testing
that referenced
this pull request
Oct 29, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request An old Eoehoma manufacturing plant dedicated to assembly of the beloved-by-many E-11 rifle. It has since become home to a particularly dedicated group of hermits. **TODO:** - [x] stuff outside the fence (placeholder rn) - [x] fill out all the descs - [x] beg people for E-11 inhands (maybe) (just put placeholders there, might be good enough) - [x] rust because I forgor - [x] faction for the hermits <details><summary>Screenshots:</summary> <p> ![scrnshot1](https://github.com/user-attachments/assets/813b570b-b21a-4446-be71-c435bf201497) ![StrongDMM-2024-09-27 20 58 55](https://github.com/user-attachments/assets/6b3f6975-5419-4592-9ca8-a5cad9a2365f) ![StrongDMM-2024-08-31 13 53 44](https://github.com/user-attachments/assets/2d526ee1-5f29-4bee-8bfe-7d3d09960e64) </p> </details> Loot you can expect here is: Way Too Many E-11s (~12); Cargo mech; Cash; Some mats; One E-10; One E-60; Six Rations Danger you can expect here: One Hermit Soldier; One Hermit Hunter; Two Hermit Wanderers; Eleven Hermit Troopers; One Goliath; One Legion; A bunch of bear traps; Acid pit I guess? Also adds: E-11 /no_cell variant; E-11 hermits; Purple hardhat (need it ok?). <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Sand planet is like. Medipen ruin 50% of the time, I swear. Also uh, Eoehoma love I guess. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: A new sand ruin - the E-11 Manufacturing Plant - and associated code. add: A purple hardhat. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
zimon9
pushed a commit
to zimon9/Shiptest-PR-testing
that referenced
this pull request
Oct 29, 2024
MrCat15352
pushed a commit
to MrCat15352/MrCat
that referenced
this pull request
Dec 27, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request An old Eoehoma manufacturing plant dedicated to assembly of the beloved-by-many E-11 rifle. It has since become home to a particularly dedicated group of hermits. **TODO:** - [x] stuff outside the fence (placeholder rn) - [x] fill out all the descs - [x] beg people for E-11 inhands (maybe) (just put placeholders there, might be good enough) - [x] rust because I forgor - [x] faction for the hermits <details><summary>Screenshots:</summary> <p> ![scrnshot1](https://github.com/user-attachments/assets/813b570b-b21a-4446-be71-c435bf201497) ![StrongDMM-2024-09-27 20 58 55](https://github.com/user-attachments/assets/6b3f6975-5419-4592-9ca8-a5cad9a2365f) ![StrongDMM-2024-08-31 13 53 44](https://github.com/user-attachments/assets/2d526ee1-5f29-4bee-8bfe-7d3d09960e64) </p> </details> Loot you can expect here is: Way Too Many E-11s (~12); Cargo mech; Cash; Some mats; One E-10; One E-60; Six Rations Danger you can expect here: One Hermit Soldier; One Hermit Hunter; Two Hermit Wanderers; Eleven Hermit Troopers; One Goliath; One Legion; A bunch of bear traps; Acid pit I guess? Also adds: E-11 /no_cell variant; E-11 hermits; Purple hardhat (need it ok?). <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Sand planet is like. Medipen ruin 50% of the time, I swear. Also uh, Eoehoma love I guess. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: A new sand ruin - the E-11 Manufacturing Plant - and associated code. add: A purple hardhat. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Code change
Watch something violently break.
Map Change
Tile placing is hard. Thank you for your service.
Ruin
Ruin successfully tested.
Sprites
A bikeshed full of soulless bikes.
Test Merge Candidate
You do it for free.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
An old Eoehoma manufacturing plant dedicated to assembly of the beloved-by-many E-11 rifle. It has since become home to a particularly dedicated group of hermits.
TODO:
Screenshots:
Loot you can expect here is: Way Too Many E-11s (~12); Cargo mech; Cash; Some mats; One E-10; One E-60; Six Rations
Danger you can expect here: One Hermit Soldier; One Hermit Hunter; Two Hermit Wanderers; Eleven Hermit Troopers; One Goliath; One Legion; A bunch of bear traps; Acid pit I guess?
Also adds: E-11 /no_cell variant; E-11 hermits; Purple hardhat (need it ok?).
Why It's Good For The Game
Sand planet is like. Medipen ruin 50% of the time, I swear.
Also uh, Eoehoma love I guess.
Changelog
🆑
add: A new sand ruin - the E-11 Manufacturing Plant - and associated code.
add: A purple hardhat.
/:cl: